gtk/gtkstyle.c (option_menu_get_props) Use gtk_border_free when freeing

2007-01-03  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkstyle.c (option_menu_get_props)
	* gtk/gtkoptionmenu.c (gtk_option_menu_get_props): Use
	gtk_border_free when freeing borders.

svn path=/trunk/; revision=17032

diff --git a/ChangeLog b/ChangeLog
index 049999e630e42bc47bd79a1fed6a315158bf0569..dcedcba09a5dc221bde4bb92308afa58209d5037 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-03  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkstyle.c (option_menu_get_props)
+       * gtk/gtkoptionmenu.c (gtk_option_menu_get_props): Use 
+       gtk_border_free when freeing borders.
+
 2007-01-03  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkentry.c (get_text_area_size): Work when the

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 69e10495c402c7e552cd4bb28cd0a439b26d18bc..b1ccf8a2e4fd84b098eaeb8a5a71c6948183aad3 100644 (file)
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -411,7 +411,7 @@ gtk_option_menu_get_props (GtkOptionMenu       *option_menu,
     props->indicator_spacing = default_props.indicator_spacing;
 
   g_free (indicator_size);
-  g_free (indicator_spacing);
+  gtk_border_free (indicator_spacing);
 }
 
 static void

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index ed35c6c07fa97306de86da7bf536070742b485fb..44b7d6eff7661cd67af39718c48120129b5a38e1 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -3253,7 +3253,7 @@ option_menu_get_props (GtkWidget      *widget,
   if (tmp_spacing)
     {
       *indicator_spacing = *tmp_spacing;
-      g_free (tmp_spacing);
+      gtk_border_free (tmp_spacing);
     }
   else
     *indicator_spacing = default_option_indicator_spacing;